Merge.
authorssmith@localhost.localdomain <ssmith@localhost.localdomain>
Mon, 11 Dec 2006 19:17:11 +0000 (11:17 -0800)
committerssmith@localhost.localdomain <ssmith@localhost.localdomain>
Mon, 11 Dec 2006 19:17:11 +0000 (11:17 -0800)
commit628116d2f762a7f825deb361b156c5f1c66bf9a6
tree45e1e13404c17993a94c632f0d345a899e7a3b87
parent7a3d8f6e4dd56771a7514624bbace26883a36da7
parentad4a42ea52b4ffadae193849771ea170ac2a3830
Merge.
xen/arch/x86/mm.c
xen/arch/x86/mm/shadow/common.c